[WIP] use machine-config-osimagestream to avoid hard-coding image tag names by cheesesashimi · Pull Request #10416 · openshift/installer

cheesesashimi · 2026-03-20T19:26:17Z

No description provided.

coderabbitai · 2026-03-20T19:26:26Z

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Excluded labels (none allowed) (1)

do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: e98279de-3c69-462d-b871-2c5a57e58ba1

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

openshift-ci · 2026-03-20T19:26:31Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

openshift-ci · 2026-03-20T19:28:29Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign zaneb for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

pablintino · 2026-03-23T13:17:57Z

data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template

+# Note: Proxy environment variables (HTTP_PROXY, HTTPS_PROXY, NO_PROXY) are
+# automatically inherited from the environment if set via /etc/profile.d/proxy.sh
+until COREOS_IMAGE=$("${TEMP_DIR}/machine-config-osimagestream" \
+    get default-node-image \


Well, we don't want the default OS image, we need to return the OS image install-config points too.
We need to pass it by using

installer/pkg/asset/ignition/bootstrap/common.go

Line 79 in bb827bf

type bootstrapTemplateData struct {

We can use this PR to remove the StreamTag field we won't use anymore.

I removed the StreamTag field and tried to just use the OSImageStream field. Unless this field is explicitly set in the install-config, it will be empty. I pushed up a change that detects this case and sets it to rhcos.DefaultOSImageStream.

This made me think about what should be the source of truth for what the default OSImageStream is: Should it be the OSImageStream code in the MCO repo? Or should it be the installer code?

We can likely defer that decision for now because the way that both the installer and MCO code is written, it shouldn't matter much. Nevertheless, it is something we should think about.

pablintino · 2026-03-23T13:18:40Z

data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template

+    --authfile /root/.docker/config.json \
+    --per-host-certs /etc/containers/certs.d \
+    --registry-config /etc/containers/registries.conf); do


Can't we rely on the defaults? (Just asking not a blocking question or ask for change)

In #10406, I don't think we can rely on the defaults since machine-config-osimagestream will be running containerized. However, I think we can rely on the defaults here. I need to look at https://github.com/containers/image to see if there is a SetDefaultValues() function someplace for types.SystemContext. If not, then I'll put these values into the machine-config-osimagestream entrypoint as the default values.

patrickdillon

What's bad about hardcoding the images? Is it because there are potentially more streams than rhcos9 & rhcos10, and we don't want to teach the installer about all of those?

patrickdillon · 2026-03-23T18:43:45Z

data/data/bootstrap/files/usr/local/bin/node-image-pull.sh.template

+# Extract the machine-config-osimagestream binary from the MCO image. This avoids having to munge podman args, paths, env vars, etc.
+podman create --name mco-osimagestream "${MCO_IMAGE}"
+podman cp mco-osimagestream:/usr/bin/machine-config-osimagestream "${TEMP_DIR}/machine-config-osimagestream"
+podman rm mco-osimagestream


Can we use podman run via

installer/data/data/bootstrap/files/usr/local/bin/bootkube.sh.template

Lines 24 to 28 in ac9a370

bootkube_podman_run() {

# we run all commands in the host-network to prevent IP conflicts with

# end-user infrastructure.

podman run --quiet --net=host --rm --log-driver=k8s-file "${@}"

}

If so, would be a little cleaner, but I'm not sure we can. Just an idea/suggestion.

So, I tried to do this in a different PR. While I eventually got it to work, it seemed really brittle.

Assisted-By: Claude Sonnet 4.5

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 20, 2026

openshift-ci bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 20, 2026

cheesesashimi force-pushed the zzlotnik/add-machine-config-osimagestream-extract-binary branch from ab08bb0 to 5f7f1bc Compare March 20, 2026 19:41

openshift-ci bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 20, 2026

pablintino reviewed Mar 23, 2026

View reviewed changes

cheesesashimi force-pushed the zzlotnik/add-machine-config-osimagestream-extract-binary branch from 5f7f1bc to dddbd35 Compare March 23, 2026 17:30

patrickdillon reviewed Mar 23, 2026

View reviewed changes

cheesesashimi force-pushed the zzlotnik/add-machine-config-osimagestream-extract-binary branch from dddbd35 to 43dd650 Compare March 23, 2026 21:28

use machine-config-osimagestream to avoid hard-coding image tag names

fc89859

Assisted-By: Claude Sonnet 4.5

cheesesashimi force-pushed the zzlotnik/add-machine-config-osimagestream-extract-binary branch from 43dd650 to fc89859 Compare March 23, 2026 21:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] use machine-config-osimagestream to avoid hard-coding image tag names#10416

[WIP] use machine-config-osimagestream to avoid hard-coding image tag names#10416
cheesesashimi wants to merge 1 commit intoopenshift:mainfrom
cheesesashimi:zzlotnik/add-machine-config-osimagestream-extract-binary

cheesesashimi commented Mar 20, 2026

Uh oh!

coderabbitai bot commented Mar 20, 2026 •

edited

Loading

Review skipped

Uh oh!

openshift-ci bot commented Mar 20, 2026

Uh oh!

openshift-ci bot commented Mar 20, 2026

Uh oh!

pablintino Mar 23, 2026

Uh oh!

cheesesashimi Mar 23, 2026 •

edited

Loading

Uh oh!

pablintino Mar 23, 2026

Uh oh!

cheesesashimi Mar 23, 2026

Uh oh!

patrickdillon left a comment

Uh oh!

patrickdillon Mar 23, 2026

Uh oh!

cheesesashimi Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	bootkube_podman_run() {
	# we run all commands in the host-network to prevent IP conflicts with
	# end-user infrastructure.
	podman run --quiet --net=host --rm --log-driver=k8s-file "${@}"
	}

Conversation

cheesesashimi commented Mar 20, 2026

Uh oh!

coderabbitai bot commented Mar 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

openshift-ci bot commented Mar 20, 2026

Uh oh!

openshift-ci bot commented Mar 20, 2026

Uh oh!

pablintino Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

cheesesashimi Mar 23, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pablintino Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

cheesesashimi Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

patrickdillon left a comment

Choose a reason for hiding this comment

Uh oh!

patrickdillon Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

cheesesashimi Mar 23, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

coderabbitai bot commented Mar 20, 2026 •

edited

Loading

cheesesashimi Mar 23, 2026 •

edited

Loading